(choose-completion): Check for next-single-property-change returning nil.

diff --git a/lisp/simple.el b/lisp/simple.el
index 237be507cf1ce43ec9ba6c75ec0e1dbfcd7de4fc..da837322c8f2303c7bc629f5c190f8ac77529fcd 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2491,7 +2491,7 @@ it were the arg to `interactive' (which see) to interactively read the value."
     (if (null beg)
        (error "No completion here"))
     (setq beg (previous-single-property-change beg 'mouse-face))
-    (setq end (next-single-property-change end 'mouse-face))
+    (setq end (or (next-single-property-change end 'mouse-face) (point-max)))
     (choose-completion-string (buffer-substring beg end))))
 
 ;; Delete the longest partial match for STRING